Remove tests and Error Fix