Cleaned up code
Better test names