files moved to bin??
added unit tests for handler methods