Tests are now passing (hard coded still)