Base tests all passing now