Parking test and Cleanup

Parking the oneline test and cleaning up unwanted lines.