Quick server fix, bug that only happenend on server when setting an id. Included test cases from home computer in solution