Re-factoring and more progress in #1
Removed renamed test file