Added server tests from API branch