SPlitting our tests from base test class
A few more bugs