Implemented some tests / fixed some.