Added unit test for multiple handlers, refactored server tests