Finalized some tests, added comments, now actually ready to merge with dev