Unit testing & clean up

The End