Added tests/cleaned up files