prepared for tests
added initial tests
merged from master