Tests added and modified