Add guard and spork, remove test dir