Re-factored a test and modified the readme.