#40 Starting to add in tests