Fix annotations, style and make the tests more readable