cleaning up tests and fixing issue with empty serialize function