Clean up and re-org of slave files, added more spec test