started improving tests, not finished yet though