Completed adding tests (for now!)