Added bin/ directory
Fixes to unit tests