Test Refactoring

close #14