Adding "logic test" form

- Also Rakefile cleanup