Feature/now 267

Fixing tests, hardcoded for now.