#59 WIP Convert tests using main to @Test, create logical test seperation