Fixed some tests / added new ones