Fixes after Unit Testing