Fixed formats
Additional tests