More tests, fixed bug from yesterday