Cleanup, brining compete tests back