added tests, removed unneeded file