Progress with tests completely working