Cleanup and add some specs
Remove test/ dir