Fix tests and class
Delete superfluous files