Updated models & added test