Profiler tests and some rework

Abandoned private constructor and cleaned up the code a bit.