Updated test's for BS 3