updated to remove system.out, made all tests runnable