Updated tests, fixed some small inconsistencies/bugs