Refactor: Removed commented test, returning soon