Add some a new test (a gcj solution) and start making it work