Updated ReadMe. Refactored a little more. Made another test 'pending'.