added scale tests, removed TODOs