Rough in better tests