added and cleaned up tests