Updated tests, refactored, added steady state population