fixing tests and updating interface