More tests due to bugs