Tests =D ! And some minor bugfixes.