removed test command
Unnecessary OOP removed and more checks