Issue/21 builddates

Fixed some unit tests and other funky stuff