Migrate more basic tests to arquillian