null & undefined won't be outputted anymore
Add unit tests