Moved some rules around and added new ones
Removed a test file