Fixed unit testing. moving on