add tests
remove old files