Progress with tests completely working
Progress with tests completely working