Converted to main class runner for test