PR for issue #191. Additional tests refactor