added more behavioural tests and new services