Renamed test to tests because that's my standard (also travis is looking at that)