working on unit tests..