More tests, fixed more problems