Fleshed out unit tests