More tests - planning to add web tests later