More tests and className and imports