fixing tests and names