Now test files aren't bundled with final application which is coo. Also reorganized them a bit