added more tests
deleted unecesary files
refactored tests