Fixed test bug
Refactoring of test and constructor parameters