Updated JUnits to use annotations