remove unecessary code, add first tests
refactor tests