Trivial test cases added. Structure changed to support multiple runs