fixed main() method
fixed unit tests