Changed Krux switch expiry to 2 weeks

Just so that this becomes a topic of conversation later.
Removed redundant lines and added test.