Changed tests, all pass now