Fixed 1 test
Code cleanup