Moved method implmentations into correct category
More tests