Removed ad-hoc tests and added sasha's awesome tests.