ran tests and fixed