Expanded test cases; fixed method collision