Port annotations tests and make them pass