Added unit tests for expand behaviour as per review