Fixed bug related to separation of tests and implementation