moar tests added, should be complete