Fix breaking tests

Abhilash Rajrequested to merge
maxking/postorius:Fix-breaking-tests into master

Made changes over !219 (closed)

Fix #214 (closed)

Edited by Abhilash Raj

Merge request reports