Implemented IValueConverters and deleted tests...