Fixed unit tests
Version 0.2
Ver 0.2