Simplified tests
Got test rewritten with unittest
Got test rewritten with unittest