Update tests

Note: Old tests were completely removed