Fixed acceptence tests and did some cleanups